From 763452a14f7b775097a36de4d72036aecc0f0289 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 18 May 2005 16:32:38 +0000 Subject: [PATCH] Fix some errors in the handling of drop columns. (#143355, John Finlay) 2005-05-18 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_get_drop_column) (gtk_tree_view_set_column_drag_info): Fix some errors in the handling of drop columns. (#143355, John Finlay) --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtktreeview.c | 6 +++--- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f8e6b38b2..efc0337b41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2005-05-18 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_get_drop_column) + (gtk_tree_view_set_column_drag_info): Fix some errors in the + handling of drop columns. (#143355, John Finlay) + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Remove the no longer needed workaround. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7f8e6b38b2..efc0337b41 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-05-18 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_get_drop_column) + (gtk_tree_view_set_column_drag_info): Fix some errors in the + handling of drop columns. (#143355, John Finlay) + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Remove the no longer needed workaround. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7f8e6b38b2..efc0337b41 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2005-05-18 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_get_drop_column) + (gtk_tree_view_set_column_drag_info): Fix some errors in the + handling of drop columns. (#143355, John Finlay) + * gtk/gtkfilechooserdefault.c (gtk_file_chooser_default_init): Remove the no longer needed workaround. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 602077053a..bbc955cb40 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -4018,7 +4018,7 @@ gtk_tree_view_get_drop_column (GtkTreeView *tree_view, continue; } - return cur_column; + return left_column; } if (!tree_view->priv->column_drop_func) @@ -4069,7 +4069,7 @@ gtk_tree_view_get_drop_column (GtkTreeView *tree_view, continue; } - return cur_column; + return left_column; } if (!tree_view->priv->column_drop_func) @@ -8054,7 +8054,7 @@ gtk_tree_view_set_column_drag_info (GtkTreeView *tree_view, /* Add the last one */ if (tree_view->priv->column_drop_func == NULL || ((left_column != column) && - (* tree_view->priv->column_drop_func) (tree_view, column, left_column, cur_column, tree_view->priv->column_drop_func_data))) + (* tree_view->priv->column_drop_func) (tree_view, column, left_column, NULL, tree_view->priv->column_drop_func_data))) { reorder = g_new (GtkTreeViewColumnReorder, 1); reorder->left_column = left_column; -- 2.30.2